Skip to content

Conversation

@juzhao
Copy link
Contributor

@juzhao juzhao commented Nov 10, 2025

revert PR: #2738 which reverted PR #2656
and added 2 enhancements:

  1. enhance test for config_test.go, check the total count of deployed NetworkPolicies is equal to len(networkPolicyNames)
  2. deploy the denyNetpol at the end for CMO, and let CVO manage CMO networkpolicies, for other component networkpolicies, they are still managed by CMO

@juzhao
Copy link
Contributor Author

juzhao commented Nov 10, 2025

/retitle OCPBUGS-61088: revert PR #2738, enhance test for config_test.go and deploy the denyNetpol at the end for CM

@openshift-ci openshift-ci bot changed the title revert PR 2738, enhance test for config_test.go and deploy the denyNetpol at the end for CMO OCPBUGS-61088: revert PR #2738, enhance test for config_test.go and deploy the denyNetpol at the end for CM Nov 10, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 10, 2025
@openshift-ci-robot
Copy link
Contributor

@juzhao: This pull request references Jira Issue OCPBUGS-61088, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

revert PR: #2738
and added 2 enhancements:

  1. enhance test for config_test.go, check the total count of deployed NetworkPolicies is equal to len(networkPolicyNames)
  2. deploy the denyNetpol at the end for CMO, see pkg/tasks/clustermonitoringoperator.go

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: juzhao.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@juzhao: This pull request references Jira Issue OCPBUGS-61088, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

revert PR: #2738
and added 2 enhancements:

  1. enhance test for config_test.go, check the total count of deployed NetworkPolicies is equal to len(networkPolicyNames)
  2. deploy the denyNetpol at the end for CMO, see pkg/tasks/clustermonitoringoperator.go

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@juzhao
Copy link
Contributor Author

juzhao commented Nov 10, 2025

/retest-required

@juzhao
Copy link
Contributor Author

juzhao commented Nov 10, 2025

/payload 4.21 ci blocking
/payload 4.21 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

@juzhao: trigger 5 job(s) of type blocking for the ci release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/da78fdd0-be32-11f0-85e8-21ed1844d3c0-0

trigger 13 job(s) of type blocking for the nightly release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/da78fdd0-be32-11f0-85e8-21ed1844d3c0-1

@juzhao
Copy link
Contributor Author

juzhao commented Nov 11, 2025

/retest-required

@juzhao juzhao changed the title OCPBUGS-61088: revert PR #2738, enhance test for config_test.go and deploy the denyNetpol at the end for CM OCPBUGS-61088: revert PR #2738, enhance test for config_test.go and deploy the denyNetpol at the end for CMO Nov 11, 2025
@juzhao
Copy link
Contributor Author

juzhao commented Nov 11, 2025

/test e2e-aws-ovn-techpreview

@juzhao
Copy link
Contributor Author

juzhao commented Nov 12, 2025

/payload 4.21 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 12, 2025

@juzhao: trigger 5 job(s) of type blocking for the ci release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/aa093d90-bf95-11f0-96c5-34b15ddbb7e8-0

@juzhao
Copy link
Contributor Author

juzhao commented Nov 12, 2025

/payload 4.21 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 12, 2025

@juzhao: trigger 5 job(s) of type blocking for the ci release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d9d0e6c0-bfce-11f0-95c3-cd880f2da26a-0

@juzhao
Copy link
Contributor Author

juzhao commented Nov 13, 2025

/payload-aggregate periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade 10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 2025

@juzhao: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c71aec10-c037-11f0-9f7e-42e20bf35f9d-0

@juzhao
Copy link
Contributor Author

juzhao commented Nov 13, 2025

/payload-aggregate periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade 10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 2025

@juzhao: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/4c4c15d0-c065-11f0-9b2c-9da27073789c-0

@juzhao
Copy link
Contributor Author

juzhao commented Nov 13, 2025

run payload 4.21 ci blocking for 3 times, the periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade all failed, checked must-gather, the upgrade is actually passed, the failure is caused by other issue.
run payload-aggregate periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade 10 separately, the upgrade on azure is passed(see from above comments).
also triggered 4.21 nightly blocking job, payload 4.21 nightly blocking, most of the jobs are passed, see details on https://pr-payload-tests.ci.openshift.org/runs/ci/da78fdd0-be32-11f0-85e8-21ed1844d3c0-1
I think this PR is not block ci and nightly blocking job. we can merge this PR if no new comment.
@machine424 @neisw WDYT?

@neisw
Copy link
Contributor

neisw commented Nov 13, 2025

I agree that the previous upgrade issues are no longer present and the test failures we see do not appear to be related.

@juzhao
Copy link
Contributor Author

juzhao commented Nov 14, 2025

/verified by @juzhao

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 14, 2025
@openshift-ci-robot
Copy link
Contributor

@juzhao: This PR has been marked as verified by @juzhao.

In response to this:

/verified by @juzhao

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 24, 2025

@neisw: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-upgrade-ovn-single-node

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/49da2620-c952-11f0-860a-5a522e335451-0

@neisw
Copy link
Contributor

neisw commented Nov 24, 2025

Thanks @juzhao I didn't see anything in the jobs your ran or the ones I retested. I think you are ok to unhold.

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

/hold cancel
/verified by @juzhao

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 25, 2025
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 25, 2025
@openshift-ci-robot
Copy link
Contributor

@juzhao: This PR has been marked as verified by @juzhao.

In response to this:

/hold cancel
/verified by @juzhao

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

just some nits, can be part of a follow-up PR. /lgtm /hold

thanks, will do in the follow up PR

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f0226ba and 2 for PR HEAD 0d45a90 in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2025
@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Nov 25, 2025
@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

/verified by @juzhao

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 25, 2025
@openshift-ci-robot
Copy link
Contributor

@juzhao: This PR has been marked as verified by @juzhao.

In response to this:

/verified by @juzhao

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

/payload 4.21 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 25, 2025

@juzhao: trigger 5 job(s) of type blocking for the ci release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/82c68d00-c9d6-11f0-899f-cc6791df983d-0

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

@machine424 please review again, the change is due to the api change, also fixed PR according to your comments, see: #2740 (comment)
the CI is not blocking

@juzhao
Copy link
Contributor Author

juzhao commented Nov 25, 2025

/payload 4.21 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 25, 2025

@juzhao: trigger 13 job(s) of type blocking for the nightly release of OCP 4.21

  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/dae03470-ca01-11f0-98a2-200e18189a59-0

@machine424
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: juzhao, machine424

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f1b4a7a and 2 for PR HEAD ce98ac6 in total

@juzhao
Copy link
Contributor Author

juzhao commented Nov 26, 2025

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 26, 2025

@juzhao: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit d0d31fd into openshift:main Nov 26, 2025
20 checks passed
@openshift-ci-robot
Copy link
Contributor

@juzhao: Jira Issue Verification Checks: Jira Issue OCPBUGS-61088
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-61088 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

revert PR: #2738 which reverted PR #2656
and added 2 enhancements:

  1. enhance test for config_test.go, check the total count of deployed NetworkPolicies is equal to len(networkPolicyNames)
  2. deploy the denyNetpol at the end for CMO, and let CVO manage CMO networkpolicies, for other component networkpolicies, they are still managed by CMO

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@juzhao juzhao deleted the revert_pr_2738 branch November 26, 2025 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants